<html>
<head><meta charset="utf-8"><title>Git help? · general · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/index.html">general</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html">Git help?</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="217571264"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571264" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Chris Denton <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571264">(Nov 22 2020 at 21:33)</a>:</h4>
<p>Is there a place for git help? I recently did small edit to a small PR and it's ended up merging in all the upstream changes. I'm not exactly sure why. I last touched the branch awhile ago but since then I've added a singing key and I might have messed about with the PR's branch during testing that. I'm not sure.  Anyway the "files changed" on github is now all messed up and I don't know how to fix it. <a href="https://github.com/rust-lang/rust/pull/78305">https://github.com/rust-lang/rust/pull/78305</a></p>



<a name="217571320"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571320" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571320">(Nov 22 2020 at 21:34)</a>:</h4>
<p>I can take a look</p>



<a name="217571327"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571327" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571327">(Nov 22 2020 at 21:35)</a>:</h4>
<blockquote>
<p>+80,366 −25,433</p>
</blockquote>
<p><span aria-label="eyes" class="emoji emoji-1f440" role="img" title="eyes">:eyes:</span></p>



<a name="217571339"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571339" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Chris Denton <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571339">(Nov 22 2020 at 21:35)</a>:</h4>
<p>Yeah it's basically everything that's changed since I first made the PR...</p>



<a name="217571343"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571343" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571343">(Nov 22 2020 at 21:35)</a>:</h4>
<p>you have a merge commit, that's the issue</p>



<a name="217571347"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571347" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571347">(Nov 22 2020 at 21:35)</a>:</h4>
<p>does <a href="https://github.com/rust-lang/rust/pull/78305/commits/be226ea03ba60f38f8704d5659b836a01306bac0">https://github.com/rust-lang/rust/pull/78305/commits/be226ea03ba60f38f8704d5659b836a01306bac0</a> have all the changes you want to make?</p>



<a name="217571357"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571357" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Chris Denton <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571357">(Nov 22 2020 at 21:35)</a>:</h4>
<p>Yes.</p>



<a name="217571409"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571409" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571409">(Nov 22 2020 at 21:36)</a>:</h4>
<p>ok, then this should work:</p>
<div class="codehilite" data-code-language="Bash"><pre><span></span><code>git reset --hard origin/master
git cherry-pick be226ea03ba60f38f8704d5659b836a01306bac0
git push -f
</code></pre></div>
<p>assuming you have <code>origin</code> as rust-lang/rust</p>



<a name="217571543"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571543" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Mara <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571543">(Nov 22 2020 at 21:39)</a>:</h4>
<p>oh just <code>git remote update; git rebase upstream/master</code> works. rebase automatically drops merges if they result in a zero change.</p>



<a name="217571593"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571593" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571593">(Nov 22 2020 at 21:40)</a>:</h4>
<p>oh huh, that's really nice</p>



<a name="217571621"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571621" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Mara <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571621">(Nov 22 2020 at 21:41)</a>:</h4>
<p>(and removes identical commits)</p>



<a name="217571886"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571886" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Chris Denton <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571886">(Nov 22 2020 at 21:48)</a>:</h4>
<p>Thank you both! I'll be sure to make a note of this so I can avoid more frustration in the future.</p>



<a name="217571985"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217571985" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Mara <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217571985">(Nov 22 2020 at 21:50)</a>:</h4>
<p>Re-approved your PR. Thanks for the quick fix :)</p>



<a name="217666952"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217666952" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Noah Lev <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217666952">(Nov 23 2020 at 18:46)</a>:</h4>
<p>Maybe <span class="user-mention" data-user-id="116122">@simulacrum</span> or someone else wants to add #git or #git-help?</p>



<a name="217666982"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217666982" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> simulacrum <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217666982">(Nov 23 2020 at 18:47)</a>:</h4>
<p>I think asking in <a class="stream" data-stream-id="122651" href="/#narrow/stream/122651-general">#general</a> is fine</p>



<a name="217666999"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217666999" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Noah Lev <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217666999">(Nov 23 2020 at 18:47)</a>:</h4>
<p>Well we have <a class="stream" data-stream-id="122653" href="/#narrow/stream/122653-zulip">#zulip</a></p>



<a name="217667032"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217667032" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Noah Lev <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217667032">(Nov 23 2020 at 18:47)</a>:</h4>
<p>But it's fine if you don't think it makes sense now</p>



<a name="217667049"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/Git%20help%3F/near/217667049" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> simulacrum <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/Git.20help.3F.html#217667049">(Nov 23 2020 at 18:47)</a>:</h4>
<p>I don't think we need a channel per tool.</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>